bitkeeper revision 1.1159.1.455 (41a61ff7up8G8qJyPAoWdgwg6BfRog)

sync w/ head.

diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c
index 4147a2c37342d4be636d746f7b7a95cc6d0563b0..fc57e0bf1cf4257216de6a319ad1a8ed3777e6d7 100644 (file)
--- a/xen/arch/x86/memory.c
+++ b/xen/arch/x86/memory.c
@@ -1317,7 +1317,7 @@ int do_mmu_update(
             (void)get_user(done, pdone);
     }
 
-    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) )
+    if ( unlikely(!array_access_ok(VERIFY_READ, ureqs, count, sizeof(req))) ) {
         UNLOCK_BIGLOCK(d);
         return -EFAULT;
     }

diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
index 0d34fd58c068ab4948e82493d4011a59f7a4a8e1..cb1734e998addab3b53616042ac8be441b657ac8 100644 (file)
--- a/xen/common/dom_mem_ops.c
+++ b/xen/common/dom_mem_ops.c
@@ -22,14 +22,14 @@
  */
 #define START_EXTENT_SHIFT 4 /* op[:4] == start_extent */
 
-#define PREEMPT_CHECK(_op)                          \
-    if ( hypercall_preempt_check() ) {              \
-        hypercall_create_continuation(              \
-            __HYPERVISOR_dom_mem_op, 5,             \
-            (_op) | (i << START_EXTENT_SHIFT),      \
-            extent_list, nr_extents, extent_order,  \
-            (d == current) ? DOMID_SELF : d->id);   \
-        return __HYPERVISOR_dom_mem_op;             \
+#define PREEMPT_CHECK(_op)                                  \
+    if ( hypercall_preempt_check() ) {                      \
+        hypercall_create_continuation(                      \
+            __HYPERVISOR_dom_mem_op, 5,                     \
+            (_op) | (i << START_EXTENT_SHIFT),              \
+            extent_list, nr_extents, extent_order,          \
+            (d == current->domain) ? DOMID_SELF : d->id);   \
+        return __HYPERVISOR_dom_mem_op;                     \
     }
 
 static long